admin: Rename prune -> cleanup, avoid doing repo prune twice

Calling it "cleanup" is better since it does more than repo pruning.

We were also doing a prune twice; ot_admin_cleanup() already does one,
so drop the bits to do it in cleanup.c.

diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index d5eaacdec49615f13bd6c7365af4eef234435cab..4c3ade906536f59f766ce43225784b335c5a7c1f 100644 (file)
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -48,7 +48,7 @@ ostree_SOURCES += \
        src/ostree/ot-admin-builtin-init-fs.c \
        src/ostree/ot-admin-builtin-diff.c \
        src/ostree/ot-admin-builtin-deploy.c \
-       src/ostree/ot-admin-builtin-prune.c \
+       src/ostree/ot-admin-builtin-cleanup.c \
        src/ostree/ot-admin-builtin-os-init.c \
        src/ostree/ot-admin-builtin-status.c \
        src/ostree/ot-admin-builtin-upgrade.c \

diff --git a/src/ostree/ot-admin-builtin-cleanup.c b/src/ostree/ot-admin-builtin-cleanup.c
new file mode 100644 (file)
index 0000000..5dc8b8e
--- /dev/null
+++ b/src/ostree/ot-admin-builtin-cleanup.c
@@ -0,0 +1,57 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2012 Colin Walters <walters@verbum.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Colin Walters <walters@verbum.org>
+ */
+
+#include "config.h"
+
+#include "ot-admin-builtins.h"
+#include "ot-admin-functions.h"
+#include "ostree.h"
+
+#include <glib/gi18n.h>
+
+static GOptionEntry options[] = {
+  { NULL }
+};
+
+gboolean
+ot_admin_builtin_cleanup (int argc, char **argv, OtAdminBuiltinOpts *admin_opts, GError **error)
+{
+  GOptionContext *context;
+  gboolean ret = FALSE;
+  __attribute__((unused)) GCancellable *cancellable = NULL;
+
+  context = g_option_context_new ("Delete untagged deployments and repository objects");
+
+  g_option_context_add_main_entries (context, options, NULL);
+
+  if (!g_option_context_parse (context, &argc, &argv, error))
+    goto out;
+
+  if (!ot_admin_cleanup (admin_opts->sysroot, cancellable, error))
+    goto out;
+
+  ret = TRUE;
+ out:
+  if (context)
+    g_option_context_free (context);
+  return ret;
+}

diff --git a/src/ostree/ot-admin-builtin-prune.c b/src/ostree/ot-admin-builtin-prune.c
deleted file mode 100644 (file)
index fc062fc..0000000
--- a/src/ostree/ot-admin-builtin-prune.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2012 Colin Walters <walters@verbum.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Colin Walters <walters@verbum.org>
- */
-
-#include "config.h"
-
-#include "ot-admin-builtins.h"
-#include "ot-admin-functions.h"
-#include "ostree.h"
-
-#include <glib/gi18n.h>
-
-static gboolean opt_no_repo_prune;
-
-static GOptionEntry options[] = {
-  { "no-repo-prune", 0, 0, G_OPTION_ARG_NONE, &opt_no_repo_prune, "Only prune deployment checkouts; don't prune repository", NULL },
-  { NULL }
-};
-
-
-gboolean
-ot_admin_builtin_prune (int argc, char **argv, OtAdminBuiltinOpts *admin_opts, GError **error)
-{
-  GOptionContext *context;
-  gboolean ret = FALSE;
-  gs_unref_object GFile *repo_path = NULL;
-  gs_unref_object GFile *deploy_dir = NULL;
-  gs_unref_object GFile *current_deployment = NULL;
-  gs_unref_object GFile *previous_deployment = NULL;
-  gs_unref_object GFile *active_deployment = NULL;
-  gs_free char *active_osname = NULL;
-  __attribute__((unused)) GCancellable *cancellable = NULL;
-
-  context = g_option_context_new ("OSNAME - Delete untagged deployments and repository objects");
-
-  g_option_context_add_main_entries (context, options, NULL);
-
-  if (!g_option_context_parse (context, &argc, &argv, error))
-    goto out;
-
-  if (argc < 2)
-    {
-      ot_util_usage_error (context, "OSNAME must be specified", error);
-      goto out;
-    }
-
-  if (!ot_admin_cleanup (admin_opts->sysroot, cancellable, error))
-    goto out;
-
-  repo_path = g_file_resolve_relative_path (admin_opts->sysroot, "ostree/repo");
-
-  if (!opt_no_repo_prune)
-    {
-      gs_free char *repo_arg = NULL;
-
-      repo_arg = g_strconcat ("--repo=", gs_file_get_path_cached (repo_path), NULL);
-      
-      if (!gs_subprocess_simple_run_sync (NULL,
-                                          GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT,
-                                          cancellable, error,
-                                          "ostree", repo_arg, "prune", "--refs-only",
-                                          "--depth=0", NULL))
-        goto out;
-    }
-
-  ret = TRUE;
- out:
-  if (context)
-    g_option_context_free (context);
-  return ret;
-}

diff --git a/src/ostree/ot-admin-builtins.h b/src/ostree/ot-admin-builtins.h
index 293922829d19eb14591b4ac19754f2fe0b4d2d78..e6dc264dee8a364cc309608118fa654d426b96f8 100644 (file)
--- a/src/ostree/ot-admin-builtins.h
+++ b/src/ostree/ot-admin-builtins.h
@@ -34,7 +34,7 @@ gboolean ot_admin_builtin_os_init (int argc, char **argv, OtAdminBuiltinOpts *ad
 gboolean ot_admin_builtin_install (int argc, char **argv, OtAdminBuiltinOpts *admin_opts, GError **error);
 gboolean ot_admin_builtin_init_fs (int argc, char **argv, OtAdminBuiltinOpts *admin_opts, GError **error);
 gboolean ot_admin_builtin_deploy (int argc, char **argv, OtAdminBuiltinOpts *admin_opts, GError **error);
-gboolean ot_admin_builtin_prune (int argc, char **argv, OtAdminBuiltinOpts *admin_opts, GError **error);
+gboolean ot_admin_builtin_cleanup (int argc, char **argv, OtAdminBuiltinOpts *admin_opts, GError **error);
 gboolean ot_admin_builtin_status (int argc, char **argv, OtAdminBuiltinOpts *admin_opts, GError **error);
 gboolean ot_admin_builtin_diff (int argc, char **argv, OtAdminBuiltinOpts *admin_opts, GError **error);
 gboolean ot_admin_builtin_upgrade (int argc, char **argv, OtAdminBuiltinOpts *admin_opts, GError **error);

diff --git a/src/ostree/ot-builtin-admin.c b/src/ostree/ot-builtin-admin.c
index 813a66b33bd570013dd8dfab06037c8665b70b4d..b7b5ead453ea69cbdf73cadd49270927730cea01 100644 (file)
--- a/src/ostree/ot-builtin-admin.c
+++ b/src/ostree/ot-builtin-admin.c
@@ -41,7 +41,7 @@ static OstreeAdminCommand admin_subcommands[] = {
   { "init-fs", ot_admin_builtin_init_fs },
   { "deploy", ot_admin_builtin_deploy },
   { "upgrade", ot_admin_builtin_upgrade },
-  { "prune", ot_admin_builtin_prune },
+  { "cleanup", ot_admin_builtin_cleanup },
   { "status", ot_admin_builtin_status },
   { "config-diff", ot_admin_builtin_diff },
   { NULL, NULL }

diff --git a/tests/test-admin-deploy-2.sh b/tests/test-admin-deploy-2.sh
index ab0bb9a1d43c478c626637fbc2afc1c99acd12db..d7ddf5f5904cd018dc6717c72d7a4c7b9b8b1403 100755 (executable)
--- a/tests/test-admin-deploy-2.sh
+++ b/tests/test-admin-deploy-2.sh
@@ -56,3 +56,9 @@ assert_has_dir sysroot/boot/ostree/testos-${bootcsum}
 assert_file_has_content sysroot/ostree/deploy/testos/deploy/${newrev}.0/etc/os-release 'NAME=TestOS'
 
 echo "ok deploy and GC /boot"
+
+ostree admin --sysroot=sysroot cleanup
+assert_has_dir sysroot/boot/ostree/testos-${bootcsum}
+assert_file_has_content sysroot/ostree/deploy/testos/deploy/${newrev}.0/etc/os-release 'NAME=TestOS'
+
+echo "ok manual cleanup"